Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 6 May 2010 22:42:55 +0000 (22:42 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 6 May 2010 22:42:55 +0000 (22:42 +0000)
commit9a7e80e126b6a86909483a3c827bc094f299b871
tree366fcf73eb20cbd200f58b221a220f072367d64e
parent1d2f513588eb582b24307e706315f2ae676d5c8a
parent4d768c063d05cfdf0100b412e11a2a15f962939d
Merge from mainline.